tidy modernize-use-auto

diff --git a/exif.cc b/exif.cc
index 783406fd849380a2369b5891250f35fc5fcedccd..124ff4edb55346cd4bee94da219e740ac0c3d6d9 100644 (file)
--- a/exif.cc
+++ b/exif.cc
@@ -286,12 +286,12 @@ static double
 exif_read_double(const ExifTag* tag, const int index)
 {
   if (tag->type == EXIF_TYPE_RAT) {
-    uint32_t num = tag->data.at(index * 2).value<uint32_t>();
-    uint32_t den = tag->data.at((index * 2) + 1).value<uint32_t>();
+    auto num = tag->data.at(index * 2).value<uint32_t>();
+    auto den = tag->data.at((index * 2) + 1).value<uint32_t>();
     return (double)num / (double)den;
   } else { // EXIF_TYPE_SRAT
-    int32_t num = tag->data.at(index * 2).value<int32_t>();
-    int32_t den = tag->data.at((index * 2) + 1).value<int32_t>();
+    auto num = tag->data.at(index * 2).value<int32_t>();
+    auto den = tag->data.at((index * 2) + 1).value<int32_t>();
     return (double)num / (double)den;
   }
 }
@@ -1399,8 +1399,8 @@ exif_write_apps()
         if (tag_size == nullptr) {
           fatal(MYNAME ": Invalid image file, in IFD1 both JPEGInterchangeFormat and JPEGInterchangeFormatLength must exist for compressed thumbnails.");
         }
-        uint32_t offset = tag_offset->data.at(0).value<uint32_t>();
-        uint32_t size = tag_size->data.at(0).value<uint32_t>();
+        auto offset = tag_offset->data.at(0).value<uint32_t>();
+        auto size = tag_size->data.at(0).value<uint32_t>();
         image_data.append(QPair<uint32_t, uint32_t>(offset, size));
         exif_put_long(IFD1, IFD1_TAG_JPEG_OFFS, 0, len);
         len += size;
@@ -1411,8 +1411,8 @@ exif_write_apps()
           fatal(MYNAME ": Invalid image file, in IFD1 both StripOffsets and StripByteCounts must exist and have equal counts for uncompressed thumbnails.");
         }
         for (unsigned idx = 0; idx < tag_offset->count; idx++) {
-          uint32_t offset = tag_offset->data.at(idx).value<uint32_t>();
-          uint32_t size = tag_size->data.at(idx).value<uint32_t>();
+          auto offset = tag_offset->data.at(idx).value<uint32_t>();
+          auto size = tag_size->data.at(idx).value<uint32_t>();
           image_data.append(QPair<uint32_t, uint32_t>(offset, size));
           if (tag_offset->type == EXIF_TYPE_SHORT) {
             exif_put_short(IFD1, IFD1_TAG_STRIP_OFFS, idx, len);

diff --git a/garmin_gpi.cc b/garmin_gpi.cc
index 842157e273ba5165d88ccb74b266c7d13430bb58..e9fabb8762162008cae2bb9e2210393f05de1096 100644 (file)
--- a/garmin_gpi.cc
+++ b/garmin_gpi.cc
@@ -429,7 +429,7 @@ read_poi(const int sz, const int tag)
   (void) len;
   int pos = gbftell(fin);
 
-  Waypoint* wpt = new Waypoint;
+  auto* wpt = new Waypoint;
   wpt->icon_descr = DEFAULT_ICON;
 
   wpt->latitude = GPS_Math_Semi_To_Deg(gbfgetint32(fin));